Store information about each proxy in ModuleExtensionUsage #22307
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The current ModuleExtensionUsage class was designed in the days before we allowed multiple `use_extension` calls for the same extension in the same module. This PR brings the class up to speed to better reflect the actual API. This will also lay the groundwork for `bazel mod tidy` working with `include()`d segments. Work towards #22063
github-actions
bot
added
team-ExternalDeps
fmeum
approved these changes
May 9, 2024
src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleThreadContext.java
Outdated
Show resolved
Hide resolved
fmeum
reviewed
May 9, 2024
| @@ -445,13 +445,14 @@ public static RootModuleFileValue evaluateRootModuleFile( | |||
| throw errorf(Code.BAD_MODULE, "error executing MODULE.bazel file for the root module"); | |||
| } | |||
| for (ModuleExtensionUsage usage : module.getExtensionUsages()) { | |||
| if (usage.getIsolationKey().isPresent() && usage.getImports().isEmpty()) { | |||
| ModuleExtensionUsage.Proxy firstProxy = usage.getProxies().getFirst(); | |||
There was a problem hiding this comment.
Maybe move this into the if and rename to onlyProxy?
There was a problem hiding this comment.
the if itself contains a reference to firstProxy.
fmeum
approved these changes
May 9, 2024
Wyverald
added
awaiting-PR-merge
github-actions
bot
removed
the
awaiting-PR-merge
Kila2
pushed a commit
to Kila2/bazel
that referenced
this pull request
May 13, 2024
The current ModuleExtensionUsage class was designed in the days before we allowed multiple `use_extension` calls for the same extension in the same module. This PR brings the class up to speed to better reflect the actual API. This will also lay the groundwork for `bazel mod tidy` working with `include()`d segments. Work towards bazelbuild#22063 Closes bazelbuild#22307. PiperOrigin-RevId: 632377764 Change-Id: I282a68bc7962088ae4583418f73b2e60a0ec88f0
Wyverald
added a commit
that referenced
this pull request
May 13, 2024
The current ModuleExtensionUsage class was designed in the days before we allowed multiple `use_extension` calls for the same extension in the same module. This PR brings the class up to speed to better reflect the actual API. This will also lay the groundwork for `bazel mod tidy` working with `include()`d segments. Work towards #22063 Closes #22307. PiperOrigin-RevId: 632377764 Change-Id: I282a68bc7962088ae4583418f73b2e60a0ec88f0
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The current ModuleExtensionUsage class was designed in the days before we allowed multiple
use_extensioncalls for the same extension in the same module. This PR brings the class up to speed to better reflect the actual API.This will also lay the groundwork for
bazel mod tidyworking withinclude()d segments.Work towards #22063